From 71db85f47880bbfba2be1d91e473dcbdc8c73d32 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir@xen.org>
Date: Fri, 8 Jul 2011 13:20:09 +0100
Subject: [PATCH] Revert 23664:3e3c0a8be9f9

---
 tools/libxc/xc_dom_elfloader.c     | 9 ---------
 xen/arch/ia64/xen/domain.c         | 8 --------
 xen/arch/x86/domain_build.c        | 8 --------
 xen/common/kernel.c                | 3 +--
 xen/common/libelf/libelf-dominfo.c | 4 +---
 xen/include/public/features.h      | 8 +-------
 6 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c
index 3ddb1dfa28..9114bfb333 100644
--- a/tools/libxc/xc_dom_elfloader.c
+++ b/tools/libxc/xc_dom_elfloader.c
@@ -286,15 +286,6 @@ static int xc_dom_parse_elf_kernel(struct xc_dom_image *dom)
     if ( (rc = elf_xen_parse(elf, &dom->parms)) != 0 )
         return rc;
 
-    if ( elf_xen_feature_get(XENFEAT_privileged, dom->parms.f_required) ||
-         (elf_xen_feature_get(XENFEAT_privileged, dom->parms.f_supported) &&
-          !elf_xen_feature_get(XENFEAT_unprivileged, dom->parms.f_supported)) )
-    {
-        xc_dom_panic(dom->xch, XC_INVALID_KERNEL, "%s: Kernel does not"
-                     " support unprivileged (DomU) operation", __FUNCTION__);
-        return -EINVAL;
-    }
-
     /* find kernel segment */
     dom->kernel_seg.vstart = dom->parms.virt_kstart;
     dom->kernel_seg.vend   = dom->parms.virt_kend;
diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index f6d27e837b..271a744e87 100644
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -2164,14 +2164,6 @@ int __init construct_dom0(struct domain *d,
 		return -1;
 	}
 
-	if (test_bit(XENFEAT_unprivileged, parms.f_required) ||
-	    (test_bit(XENFEAT_unprivileged, parms.f_supported) &&
-	     !test_bit(XENFEAT_privileged, parms.f_supported)))
-	{
-		printk("Kernel does not support Dom0 operation\n");
-		return -1;
-	}
-
 	p_start = parms.virt_base;
 	pkern_start = parms.virt_kstart;
 	pkern_end = parms.virt_kend;
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index d4787a79f2..cbb92699f7 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -415,14 +415,6 @@ int __init construct_dom0(
         return -EINVAL;
     }
 
-    if ( test_bit(XENFEAT_unprivileged, parms.f_required) ||
-         (test_bit(XENFEAT_unprivileged, parms.f_supported) &&
-          !test_bit(XENFEAT_privileged, parms.f_supported)) )
-    {
-        printk("Kernel does not support Dom0 operation\n");
-        return -EINVAL;
-    }
-
 #if defined(__x86_64__)
     if ( compat32 )
     {
diff --git a/xen/common/kernel.c b/xen/common/kernel.c
index 45c900e335..5558dc0712 100644
--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -278,8 +278,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE(void) arg)
         switch ( fi.submap_idx )
         {
         case 0:
-            fi.submap = 1U << (IS_PRIV(current->domain) ?
-                               XENFEAT_privileged : XENFEAT_unprivileged);
+            fi.submap = 0;
             if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) )
                 fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb);
             if ( paging_mode_translate(current->domain) )
diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c
index 67ec1468ab..57ca26088b 100644
--- a/xen/common/libelf/libelf-dominfo.c
+++ b/xen/common/libelf/libelf-dominfo.c
@@ -26,9 +26,7 @@ static const char *const elf_xen_feature_names[] = {
     [XENFEAT_writable_descriptor_tables] = "writable_descriptor_tables",
     [XENFEAT_auto_translated_physmap] = "auto_translated_physmap",
     [XENFEAT_supervisor_mode_kernel] = "supervisor_mode_kernel",
-    [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb",
-    [XENFEAT_privileged] = "privileged",
-    [XENFEAT_unprivileged] = "unprivileged"
+    [XENFEAT_pae_pgdir_above_4gb] = "pae_pgdir_above_4gb"
 };
 static const int elf_xen_features =
 sizeof(elf_xen_feature_names) / sizeof(elf_xen_feature_names[0]);
diff --git a/xen/include/public/features.h b/xen/include/public/features.h
index 6298e2d11c..0e3c486249 100644
--- a/xen/include/public/features.h
+++ b/xen/include/public/features.h
@@ -75,13 +75,7 @@
 #define XENFEAT_hvm_safe_pvclock           9
 
 /* x86: pirq can be used by HVM guests */
-#define XENFEAT_hvm_pirqs                 10
-
-/* privileged operation is supported */
-#define XENFEAT_privileged                11
-
-/* un-privileged operation is supported */
-#define XENFEAT_unprivileged              12
+#define XENFEAT_hvm_pirqs           10
 
 #define XENFEAT_NR_SUBMAPS 1
 
-- 
2.30.2